From 007240648181866c360986e4862838aed1f16f7d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Jul 2006 14:48:00 +0000 Subject: [PATCH] Don't leak default_sort_data. (#346341, Christian Weiske) 2006-07-02 Matthias Clasen * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): Don't leak default_sort_data. (#346341, Christian Weiske) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtktreemodelsort.c | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1358d65b2f..fc000cfc32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-30 Matthias Clasen + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): + Don't leak default_sort_data. (#346341, Christian Weiske) + * gtk/Makefile.am: Make sure all win32-specific printing sources are distributed. (#346312, Erik van Pienbroek) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1358d65b2f..fc000cfc32 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-06-30 Matthias Clasen + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize): + Don't leak default_sort_data. (#346341, Christian Weiske) + * gtk/Makefile.am: Make sure all win32-specific printing sources are distributed. (#346312, Erik van Pienbroek) diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 0a744aca7e..b557fe3f16 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -353,6 +353,14 @@ gtk_tree_model_sort_finalize (GObject *object) tree_model_sort->sort_list = NULL; } + if (tree_model_sort->default_sort_destroy) + { + tree_model_sort->default_sort_destroy (tree_model_sort->default_sort_data); + tree_model_sort->default_sort_destroy = NULL; + tree_model_sort->default_sort_data = NULL; + } + + /* must chain up */ G_OBJECT_CLASS (gtk_tree_model_sort_parent_class)->finalize (object); } -- 2.30.2